Fix "make syntax-check" failures.

Signed-off-by: Giuseppe Scrivano <gscrivan@redhat.com>

diff --git a/autogen.sh b/autogen.sh
index 3dc2b94b9da3a28395ff5b5fdbf5a27de77e7844..b8460d62219358350be60934ad08248e12875ebd 100755 (executable)
--- a/autogen.sh
+++ b/autogen.sh
@@ -29,7 +29,7 @@ else
 fi
 
 cd $olddir
-if ! test -f libglnx/README.md -o bsdiff/README.md; then
+if ! test -f libglnx/README.md || ! test -f bsdiff/README.md; then
     git submodule update --init
 fi
 # Workaround automake bug with subdir-objects and computed paths

diff --git a/src/libostree/ostree-repo-commit.c b/src/libostree/ostree-repo-commit.c
index 3aa7270095a9fecb418b2d75c930d93ccccbd15b..91b345e394b26d0826b72c1e538f630fb9732c72 100644 (file)
--- a/src/libostree/ostree-repo-commit.c
+++ b/src/libostree/ostree-repo-commit.c
@@ -1153,7 +1153,7 @@ rename_pending_loose_objects (OstreeRepo        *self,
           loose_objpath[1] = dent->d_name[1];
           loose_objpath[2] = '/';
 
-          strncpy (loose_objpath + 3, child_dent->d_name, sizeof (loose_objpath)-3);
+          g_strlcpy (loose_objpath + 3, child_dent->d_name, sizeof (loose_objpath)-3);
 
           if (!_ostree_repo_ensure_loose_objdir_at (self->objects_dir_fd, loose_objpath,
                                                     cancellable, error))

diff --git a/src/libostree/ostree-repo-static-delta-compilation-analysis.c b/src/libostree/ostree-repo-static-delta-compilation-analysis.c
index 923115fc4fda95b80fa9c6c71050e04f3a907c65..9f6465620c03603feb309189ae5c763ed98e6e9a 100644 (file)
--- a/src/libostree/ostree-repo-static-delta-compilation-analysis.c
+++ b/src/libostree/ostree-repo-static-delta-compilation-analysis.c
@@ -302,4 +302,3 @@ _ostree_delta_compute_similar_objects (OstreeRepo                 *repo,
  out:
   return ret;
 }
-

diff --git a/src/ostree/ot-builtin-gpg-sign.c b/src/ostree/ot-builtin-gpg-sign.c
index 74354d03d21297eb8414df0dfc2b85619eeb0fd7..cc298434de9b749ef2080e768d21647e807ce62f 100644 (file)
--- a/src/ostree/ot-builtin-gpg-sign.c
+++ b/src/ostree/ot-builtin-gpg-sign.c
@@ -91,4 +91,3 @@ out:
 
   return ret;
 }
-